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

Bug: 120848293
Change-Id: I4f29d99b408119893b7a3be17bdb6ec263dbfb2d