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

Change-Id: Ia1d8d9667ba77f154a257019db0efd3f51fc7ebf