am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

* commit 'f945235a8adc6b163a0e46941791bb305ef37034':
  Google Add-On API Documentation Fixes (5429077)