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

Change-Id: Ifc21d4f698060be5afea5d363822938d89c101d8