Merge "[Policy] Remove hardcoded credentials from pap"