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