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