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

Change-Id: I7e36d55d2471cf6bbc981b475f20758522212512