Merge "Minor improvements for invoke-custom" am: bc8835fdc6
am: 7bb9b170d6

Change-Id: I56f414d45b320c6299bb78db2997be3db622c6f9