Manually merge changes from giant AOSP topic

Change-Id: I2c361f075c420038ce9c0450fd4a9f2b2c52b71b
tree: 3bab6d094c78d500d34682e7f4e8aae8ca125301
  1. .gitignore
  2. app.yaml
  3. main.py
  4. main_test.py