Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev