Merged from http://go/wvgerrit/160746 Bug: 251599048 Change-Id: I66bd4766e1cb5f6b9592e1f804a68258f9e9a3d2