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