Merge "Revert "Refinements relating to invoke-custom"" am: b962db7b76 am: 3bc6e34d00
am: e8f740d97c

Change-Id: I2d2e23da889a7f404f63aa5db83cac53c92e64fc