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