Merge "Fix policy log typos"