Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I251c0f6c761b80790f8e2f9cce7b94744a6b22ce
Change-Id: Iac7a90a1a0721e1a67828e0b5a8415625e60c41f