mechanic + uiauto upgrade
Merge pull request #2846 from sebv/mechanic-upgrade

Mechanic + uiauto upgrade