Merge "dx: Extend test 135-invoke-custom"
am: 52ff15affb

Change-Id: I834cc65bece657ece993684973fdb89f50f9654d