Using CloudFront storage as default
Merge "safin/f1684-default-cloudfront"