Merge commit 'goog/master' into merge_master
tree: 34ba0bdc048129fa15edb3f7e013b78c700ea347
  1. include/
  2. media/