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

Change-Id: I7dbb13054e30346390a2f4c617345ad2d23de091