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

Bug: 120848293
Change-Id: Ibd81b8904da05df79516e824f7d7a41aff775ec0