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

Change-Id: I3947109be160fdd2a0f6aeeb77d157b4d1e4f02a