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

Bug: 120848293
Change-Id: I894bf0e5e8565de8ef625a0270906bee0e7f0b55