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

Change-Id: I8992c7f34407e666dbe0efa5a9bcc76f09bf9c3b