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