Merge "Refinements relating to invoke-custom"
am: c4a548c4ab

Change-Id: Ida81b6300cf163de92e31ef9b467faa940148b5e