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

Bug: 120848293
Change-Id: Ibea0a62fd5b693d50e41bd301a4a3e7d529422d4