Merge "Check proto argument in arguments for service"
am: 393b409881

Change-Id: Ie62868ce9b5687df0d29432ea5d0d3be881bd4a5