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