Merge "Revert^2 "Refinements relating to invoke-custom"" am: 4211797b am: 57fdeee9 am: 3e50aedf am: f70a738b Change-Id: I63a149454250be5b9ec48eecec1709a38cbbd72a