[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: a741ffd8d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I16d7e4d84b2adc8a7c61d65adec7d348d1f7501f
tree: ffe135282cb55a918f557d052cb57e2092de8919
  1. proto/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS