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