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

Bug: 120848293
Change-Id: Ibdb71cefad4dfa7461fc0d320a1ec4b51c977556