Merge "Revert^2 "Refinements relating to invoke-custom""
am: 4211797bd3

Change-Id: I46fb5e94858dee252fbd37817eb6082d9ad915f7