Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I8994217304f482e4a47e57ad25e7255d2734d275
Change-Id: I8a94537db7e293c3a7b10b3d6edf3e7bb52de22b