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

Bug: 120848293
Change-Id: I7eaabc1d2256e4fdbcbd15d5cbf89b89f3835b3c