Merge "Don't use profiles with vm safe mode" into nyc-mr1-dev