Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: If05c68cda1cc737cf32cce267c968880f1e7e1e1
Change-Id: I37c91a3f6f3155a6317cd69ec13de76fc7ccaf1c