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

Bug: 120848293
Change-Id: Id63d3420aa0e0d506260ab3b82b724bf194ebb5c