Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I9020009ca9e4681c0abc368d58c4d78de51a8987
Change-Id: Ia9121bcee53916a32376377ad7b6acdf0ed93c2d