Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master

Bug: None.
Test: NA.
Change-Id: I04ebbaa3c2f939b139f0b8b6f25777383fd42375
Merged-In: Ifcc0c80f1da45c2ff89f7c88da6407ba777473e2
2 files changed