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

Bug: 120848293
Change-Id: I9064e2d1f74de181b33f32b0594a7dbfb9264b8f