Merge "Move CLIENT_PROTOCOL_VERSION to point of use" am: a75411975a am: 71e1bf58d0
am: c472d5f641

Change-Id: Ie11ec05e3b44ebb1e23f03aab3d65f197041b97d