Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I7fda30eb7ba4450dd524ff2e4084e562335eab03
Change-Id: I997f5f93b9221528d6e03d1a53e271cf40e2a060