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

Change-Id: I5ce6bcdfd9eec312f4ee2ebb99b3cf2e0ceadf99