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