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

Change-Id: I267bb79e45ea061107ecd4c6837268a95ba84037