Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: Ie74073a1e5b0ba629be5bd2007f1546e9b84194e
Change-Id: I9cd58a1c9be7347a13541e53b5876d965a11f35b