Merge "OOM changes to support PE https"