Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I869dc9ae03ddf2391bb1ee9c595cacd9c4bcc552
Change-Id: I59223c2640cc074c3be60f02f310f9341be976e2