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

Bug: 120848293
Change-Id: If54f4deaf882709947f163d43d1a4d1578b06440
tree: e6f2eb3a71adf37bfb0e272764ea99de556cc0ee
  1. darwin-x86/
  2. linux-x86/
  3. manifest.xml