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

Bug: 120848293
Change-Id: Iea361cef9012847e0ee51f09a13d98643a548ff5