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

Change-Id: Id7b5ebfd247fbeca81c25a15167f95ebd34c5eea