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