Merge "Fix incorrect hstsEnforced lookup" am: 1347cb81f4
am: 90b9ed5c82

* commit '90b9ed5c82f5a3bd754bebe69a8883b65d3f95cc':
  Fix incorrect hstsEnforced lookup