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