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

Change-Id: Ic21363cd264279ab5f63baf77210bc0aff41e034