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