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

Bug: 120848293
Change-Id: Ib8e734cef5caf8160a0c7c5b8a67c7e62bee3de0