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

Change-Id: I3befbc310c31ef95ec34fa8f2d01e5b2d9e88565