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

Change-Id: I6da61679eeff985c8d063f21b7ec31cae5aa9569