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