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

Bug: 120848293
Change-Id: Ibaff6b9cf32bbc42ecb47aa6885e75004cff4436