Merge "Fix potenial NPE in PhonePolicy"