Merge "Update ICC lock API methods"