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