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