Merge stage-aosp-master into pi-dev-plus-aosp
am: 1aa587928d

Change-Id: I1922cd2e73f364e69d54e2821f0ceabbaccb794b
tree: d930238657ecc26a7c3d6e7182fe85f6915b8ae4
  1. configs/
  2. gae/
  3. proto/
  4. script/
  5. .gitignore
  6. __init__.py
  7. OWNERS
  8. PREUPLOAD.cfg