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