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