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

Change-Id: I78a5ee131f28eca25d8e6c5879bec4e1c97cd43a