Merge "Move CLIENT_PROTOCOL_VERSION to point of use"
am: a75411975a

Change-Id: I323304a3b2ef2b38c76c09fbdeee0c8b7f3debdf