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

Bug: 120848293
Change-Id: Ief04a744839d19066ca72d25ceec769dcd5ee176