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

Change-Id: If5019cf41350611de78b6e2cd163e41ccf7bc302