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

Change-Id: I7d5a3446ce7555fe30d51ff3f717ad64de481a23