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