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

Bug: 120848293
Change-Id: I69fd4b82e6eb0d7ca498a933238d89d7ca8a371f