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

Bug: 120848293
Change-Id: I339b84866a05dc4e7a3534c774072b0933532092