Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 49deefb5b2

Change-Id: Id08b93ead639cef18e0ba77fad77caaae16d7762