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

Change-Id: Icede435f038840eab78c5c5d3758af680b6ed2ce