Merge "Revert^2 "Refinements relating to invoke-custom"" am: 4211797bd3 am: 57fdeee982 am: 3e50aedfbb
am: f70a738ba5

Change-Id: I63a149454250be5b9ec48eecec1709a38cbbd72a