Merge "Change Policy PAP & API to https by default"