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

Change-Id: I910684705e21b5e9c998fa89a1496ca195f43973