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

Change-Id: Id06738516af325de8d68b60cdfb8f68e25cff94c