Merge "Implementing Lock contention API"