Merge remote-tracking branch 'goog/master' into support_refactor

Change-Id: I988a46d4d8097c49074286de265cd39487a4be7c