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

Bug: 120848293
Change-Id: Ibea440ebfa0c080f300a61b43ed253cc523dd015