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

Change-Id: I7a58fdbab63c1c4cd11973d49278571db0c50fde