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