Merge "sdm: Remove lock in ResourceDefault implementation"