Merge "Move CLIENT_PROTOCOL_VERSION to point of use" am: 08c99b6abf
am: 92a660a992

Change-Id: I7b9fb97632a98bd31dc30bf81cdfde28f8211980