Import change from Bug 1501791
Import change from Bug 1501791

See also https://phabricator.services.mozilla.com/D9696

mozilla-services/screenshots,mozilla-services/pageshot,mozilla-services/pageshot,mozilla-services/screenshots,mozilla-services/screenshots,mozilla-services/screenshots,mozilla-services/pageshot,mozilla-services/pageshot