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

Change-Id: Iaa269e313fe7a0ca5128e04692fcd5119d7c4376