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

Change-Id: I4c7f09b30207177815a24548a95e1bd823eeae85