--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -226,28 +226,20 @@ static const char kStarfield_Services_Ro
 /* StartCom Certification Authority */
 static const char kStartCom_Certification_AuthorityFingerprint[] =
   "5C8kvU039KouVrl52D0eZSGf4Onjo4Khs8tmyTlV3nU=";
 
 /* StartCom Certification Authority G2 */
 static const char kStartCom_Certification_Authority_G2Fingerprint[] =
   "FSg5faISiQqDCwuVpZlozvI0dzd531GBzxD6ZHU0u2U=";
 
-/* TC TrustCenter Class 2 CA II */
-static const char kTC_TrustCenter_Class_2_CA_IIFingerprint[] =
-  "rPZeHWLLWKK6/W/6tA+4hpnEc5fPXLSD1C1pytNM1Is=";
-
 /* TC TrustCenter Class 3 CA II */
 static const char kTC_TrustCenter_Class_3_CA_IIFingerprint[] =
   "k5KuIUmSSt435kXbof9L3dzaKykbYJdmnSr6XHo3Jhk=";
 
-/* TC TrustCenter Universal CA I */
-static const char kTC_TrustCenter_Universal_CA_IFingerprint[] =
-  "st71NirT+s0EvSkEekOET3ZwNOpIkvgOVr7mkCQ+JQI=";
-
 /* TC TrustCenter Universal CA III */
 static const char kTC_TrustCenter_Universal_CA_IIIFingerprint[] =
   "q1zbM1Y5c1bW5pGXPCW4YYtl12qQSG6nqKXBd2f0Zzo=";
 
 /* TestSPKI */
 static const char kTestSPKIFingerprint[] =
   "AAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
@@ -403,20 +395,18 @@ static const char* kPinset_google_root_p
   kAffirmTrust_NetworkingFingerprint,
   kAddTrust_External_RootFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
   kGeoTrust_Universal_CAFingerprint,
   kEquifax_Secure_Global_eBusiness_CAFingerprint,
   kTC_TrustCenter_Universal_CA_IIIFingerprint,
   kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
-  kTC_TrustCenter_Class_2_CA_IIFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_AuthorityFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_AuthorityFingerprint,
-  kTC_TrustCenter_Universal_CA_IFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
   kComodo_AAA_Services_rootFingerprint,
   kAffirmTrust_PremiumFingerprint,
   kAddTrust_Qualified_Certificates_RootFingerprint,
 };
 static const StaticFingerprints kPinset_google_root_pems_sha256 = {
   sizeof(kPinset_google_root_pems_sha256_Data) / sizeof(const char*),
   kPinset_google_root_pems_sha256_Data
@@ -746,16 +736,17 @@ static const TransportSecurityPreload kP
   { "android.com", true, false, false, -1, &kPinset_google_root_pems },
   { "api.accounts.firefox.com", true, false, true, 5, &kPinset_mozilla_services },
   { "api.twitter.com", true, false, false, -1, &kPinset_twitterCDN },
   { "apis.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "appengine.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "apps.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "aus4.mozilla.org", true, true, true, 3, &kPinset_mozilla },
+  { "aus5.mozilla.org", true, true, true, 7, &kPinset_mozilla },
   { "blog.torproject.org", true, false, false, -1, &kPinset_tor },
   { "blogger.com", true, false, false, -1, &kPinset_google_root_pems },
   { "blogspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "business.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "business.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "cdn.mozilla.net", true, false, true, -1, &kPinset_mozilla },
   { "cdn.mozilla.org", true, false, true, -1, &kPinset_mozilla },
   { "chart.apis.google.com", true, false, false, -1, &kPinset_google_root_pems },
@@ -775,16 +766,18 @@ static const TransportSecurityPreload kP
   { "developers.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "dist.torproject.org", true, false, false, -1, &kPinset_tor },
   { "dl.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "docs.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "domains.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "doubleclick.net", true, false, false, -1, &kPinset_google_root_pems },
   { "drive.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "dropbox.com", false, false, false, -1, &kPinset_dropbox },
+  { "dropboxstatic.com", false, true, false, -1, &kPinset_dropbox },
+  { "dropboxusercontent.com", false, true, false, -1, &kPinset_dropbox },
   { "encrypted.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "exclude-subdomains.pinning.example.com", false, false, false, 0, &kPinset_mozilla_test },
   { "facebook.com", false, false, false, -1, &kPinset_facebook },
   { "g.co", true, false, false, -1, &kPinset_google_root_pems },
   { "ggpht.com", true, false, false, -1, &kPinset_google_root_pems },
   { "glass.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "gmail.com", false, false, false, -1, &kPinset_google_root_pems },
   { "goo.gl", true, false, false, -1, &kPinset_google_root_pems },
@@ -1077,26 +1070,28 @@ static const TransportSecurityPreload kP
   { "wf-demo-eu.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-demo-hrd.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-dogfood-hrd.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-pentest.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-staging-hr.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-training-hrd.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-training-master.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-trial-hrd.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
+  { "withgoogle.com", true, false, false, -1, &kPinset_google_root_pems },
+  { "withyoutube.com", true, false, false, -1, &kPinset_google_root_pems },
   { "www.dropbox.com", true, false, false, -1, &kPinset_dropbox },
   { "www.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "www.gmail.com", false, false, false, -1, &kPinset_google_root_pems },
   { "www.googlemail.com", false, false, false, -1, &kPinset_google_root_pems },
   { "www.torproject.org", true, false, false, -1, &kPinset_tor },
   { "www.twitter.com", true, false, false, -1, &kPinset_twitterCom },
   { "xbrlsuccess.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "youtu.be", true, false, false, -1, &kPinset_google_root_pems },
   { "youtube-nocookie.com", true, false, false, -1, &kPinset_google_root_pems },
   { "youtube.com", true, false, false, -1, &kPinset_google_root_pems },
   { "ytimg.com", true, false, false, -1, &kPinset_google_root_pems },
 };
 
-// Pinning Preload List Length = 356;
+// Pinning Preload List Length = 361;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1446891927723000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1449780589679000);