am 10b553db: am a6369cf4: Merge "Fix MediaRandomTest watchdog affecting other...
am 10b553db: am a6369cf4: Merge "Fix MediaRandomTest watchdog affecting other tests" into jb-mr1-dev
* commit '10b553db':
Fix MediaRandomTest watchdog affecting other tests