Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev