Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I02e0a07805d23b955069fad93b61b4476e5e364e
Change-Id: I4bf7c621ed032b045b5b3fb19e7b01024639a24f