Merge "Fix potential NPE on devices without DPMS" into mnc-dev