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

Change-Id: I4b90cf420d7cc3278cd1ae27b285ac71fe211ced