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