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

Bug: 120848293
Change-Id: I867f5da60fbb78d8c4e6a1a4c824d861c2b64c81
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.