Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: I4a8d5731ea3faf25036b7147c2eba71013b52850