am 881bef86: am c8fe6860: Merge "Change --screenshot-on-ui-failure to --screenshot-on-failure" into jb-mr2-dev

* commit '881bef866b8af59eba86ac80f50cd33800dfd2c7':
  Change --screenshot-on-ui-failure to --screenshot-on-failure