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

* commit '657877993525d438a40032e1c334e9cebfc8a46d':