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

Change-Id: I0fa288114bc170410e26e3619e6753eca5e3bb7c