Ensure this function is always called when initializing clients. Change-Id: Ife36d9dd9e817a2e317de3a9bbf611cfefc6ded6