Merge "test: Add support for jasmin" am: 06410c093d
am: 3ed575745d

Change-Id: I3e591de635e1c8758e4044917b89d986b14dae4d