Merge "Fix for properly setting SIM lock state."