DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I4acbd744f2feaa4af99fe2959fdf34f5bcfa1923