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