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

Bug: 120848293
Change-Id: Iad694f1157e75d2d054019d02978fd73a863c203