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

Bug: 120848293
Change-Id: I32a051067ec8181d7d67dd038666bb87672710be