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

Change-Id: I4b976ed6b15db4bfb5757bd974fb8e7737a69dc0