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

Bug: 120848293
Change-Id: I9dc560a17ebb639c244a84e7750312547eac7d57