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

Change-Id: If459e60e1f9838a3c9aa45e7193b24879d6a5333