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