Merge "Align proto naming with server configuration" am: 2cd6f2446c
am: 4f9c63ad1d

Change-Id: If2c4f5843e225c8fd0f7faabfd834a19bb6c70ed