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