Merge commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7' * commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7': Still use ro.monkey