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