Merge commit 'goog/master_gl' into merge_master_gl