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

Change-Id: Ia9dbdf5652dc7fbd5c299ca0f7160865c856aae6