Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD
am: 243a468c11

* commit '243a468c11fdb24ce549353b7427678dc8e9e2d5':