Merge "Remove AccountClientCustomizedHeader class"