Merge "Merge from expected_upstream branch after sync EXPECTED_UPSTREAM file"