Merge "Pass through inputs beyond arguments in invoke." am: 6ecff4d212 am: ad0cd4edb1 am: bb86eb5051
am: 6a4d0ffa0a

Change-Id: I8c84f4231ae898b2929eba87c51d88ee3cee8f38