DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: If5b0482d71001934e6041ae046cc594f7c76fb1b