Merge commit 'goog/master' into merge_master
tree: 0153b9a7fbca8d913e736e0ab33760c4f87c27b9
  1. include/
  2. media/