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

Change-Id: I3bb8ef51a9b4c61a443f0b2e0b6f89e54d99b87f