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