Merge "Remove restrictions PIN functionality" into mnc-dev