Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I567c7e25a01a506661580b271374228bacb4d110
Change-Id: I9f131b267a600482b198634d6929c821b21e9d47