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