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

Bug: 120848293
Change-Id: I43b97663a45fbbfbe86c22ee7a210f717d1db16b