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