Merge "add moto to vendor owner whitelist"