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

Change-Id: I3424a6819bf5c0ab57e6299d067c8dd62c292c42