Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I084e1ce2f7e37043485d67eca211a2bafc57c1d4
Change-Id: I39678cb2ee2352f49481fadc25a6244f990401b4