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