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