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

Change-Id: I74019a9951937a31e742c2319e3761ede6cc9f90