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

Change-Id: I26f47c207786c699ef5bc71776ca5ae046e6a99a