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

Bug: 120848293
Change-Id: I23010c739b98f0f8594639cb7d92d87e50ec061c