Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 274f3b22b7

Change-Id: Ibd9ff23599478d4b4fe1af2744b3b6eeaa35d37c