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