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