Do not fail assertion if re-setting the same lock (#13440)

Change-Id: I2e7e9dcf8739a04583d8e42a86a1fede36011813