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

Change-Id: I79c9d5853063624231194a659831988c64912dbb