Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I47ef91d9d55cf89777dee5020f8aa310dced8557
Change-Id: I211e42f1fee337ce51d432786fe514444e66ce66