Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 3403c37ac3

Change-Id: I07cd2b26c6c0a402b13f10a51e28844bd5d716e0