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

Change-Id: I083bb3a3dc47e13b5a17800734b5599d8324c6d3