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

Bug: 120848293
Change-Id: I9a872e2af6d76b5503c36b443790a6ac1dcc8d90