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

Bug: 120848293
Change-Id: I3cc3e32167549847eed0ee5ec465e0b3f993413b