Update pr to be in synk with mozmill-automation