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

Change-Id: Iee90e3d066f60b8c17f626f1aa922678bca172e3