DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: Ib155002edccb91707476ab3d54b4c1577f5b3862