Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ida54cdbb9fb300f8dfcf42fbae2715c2e3ea4b8d
Change-Id: I7bb28a49002d95decb735176cb7d734e3ffbf8eb