am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev

* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
  Allow for setting test type as a monkey.