Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I293298e3e46a082b2aceeee2b3711db0a843b156
Change-Id: Idbb48a452d1da60129cf7f74233eac149079bc83