Merge "Merge remote-tracking branch 'aosp/expected_upstream' into fix-vector-test-mergeconflict"