Merge "Add a guard against NullPointerException in RestrictedLockUtils."