Merge "Remove ObjectClientCustomizedHeader class"