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

Change-Id: Ibe1f4864c68abdd30c16b09114a0783727dc7005