Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: If4d171d9eef3f94e6dc6c9a832dcaffc2dae4ba1
Change-Id: I547d19f2996e545eb1882925daa57db6f9d5f64c