Merge remote-tracking branch 'goog/android-master' into HEAD