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